fix(ci): Fix failing CI dependencies due to Werkzeug and pytest_django#1124
Merged
Conversation
ahmedetefy
marked this pull request as draft
May 31, 2021 08:55
ahmedetefy
changed the title
…entry-python into ahmed-fix-failing-ci-trytond
…entry-python into ahmed-fix-failing-ci-trytond
…entry-python into ahmed-fix-failing-ci-trytond
ahmedetefy
marked this pull request as ready for review
June 1, 2021 17:19
untitaker
approved these changes
Jun 1, 2021
Comment on lines
+27
to
+36
| pytest_mark_django_db_decorator = pytest.mark.django_db | ||
| try: | ||
| pytest_version = tuple(map(int, pytest_django.__version__.split("."))) | ||
| if pytest_version > (4, 2, 0): | ||
| pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__") | ||
| except ValueError: | ||
| if "dev" in pytest_django.__version__: | ||
| pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__") | ||
| except AttributeError: | ||
| pass |
Member
There was a problem hiding this comment.
I think this is simpler:
Suggested change
| pytest_mark_django_db_decorator = pytest.mark.django_db | |
| try: | |
| pytest_version = tuple(map(int, pytest_django.__version__.split("."))) | |
| if pytest_version > (4, 2, 0): | |
| pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__") | |
| except ValueError: | |
| if "dev" in pytest_django.__version__: | |
| pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__") | |
| except AttributeError: | |
| pass | |
| pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__") | |
| try: | |
| pytest_version = tuple(map(int, pytest_django.__version__.split("."))) | |
| if pytest_version <= (4, 2, 0): | |
| pytest_mark_django_db_decorator = pytest.mark.django_db | |
| except (ValueError, AttributeError): | |
| pass |
you'd have to test if this works though
Contributor
Author
There was a problem hiding this comment.
Nah that would not work because pytest_django.__version__ was introduced in 4.0 I think, which means it will default to pytest.mark.django_db(databases="__all__") which isn't great because that will fail the tests for pytest_django versions <4.3
Contributor
Author
There was a problem hiding this comment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes failing CI due to :
trytondfailing dependency because it uses deprecated methods in Wekzeug and so pinningwerkzeugto version<2.0pytest-djangoversion4.3